New upstream release

Refresh patch series

diff --git a/debian/changelog b/debian/changelog
index 16bacd8285da6f2777c3b6ed8ec34211508b16d4..717e828a6969bdf946d3d4e870556757f350c667 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ostree (2019.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refresh patch series
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 23 Aug 2019 08:38:47 +0100
+
 ostree (2019.2-2) unstable; urgency=medium
 
   * Upload to unstable

diff --git a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
index 4b370fbb089a6399e8b75328b31dd062538435c8..35e8a37807b86e7cbe3778e01c25b7fb60b2d191 100644 (file)
--- a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
+++ b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
@@ -18,7 +18,7 @@ Signed-off-by: Simon McVittie <smcv@debian.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh
-index a2707d6..33b9d37 100755
+index 237a863..c646c13 100755
 --- a/tests/test-pull-repeated.sh
 +++ b/tests/test-pull-repeated.sh
 @@ -23,6 +23,10 @@ set -euo pipefail
@@ -29,6 +29,6 @@ index a2707d6..33b9d37 100755
 +    skip "Non-deterministic test will fail if we are unlucky"
 +fi
 +
- echo "1..4"
- 
- COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}"
+ COMMIT_SIGN=""
+ if has_gpgme; then
+     COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}"